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

Update to rust-master