Update to rust master
Merge pull request #10 from cmr/update-master

Update to rust master