fixed for latest rust and included+fixed pull request #54
Merge pull request #55 from HeroesGrave/master

Fix for latest Rust, and include+fix #54