Update to rust-master
Merge pull request #39 from am0d/rust-master

Update to rust-master