Update for rust-master
Merge pull request #13 from am0d/master

Update for rust-master