fixes for latest rust
Merge pull request #3 from itdaniher/master

fixes for latest rust