Merge pull request #16 from bobakker/master

Update to rust master