Fix for latest rust-master
Merge pull request #48 from am0d/master

Fix for latest rust-master