Merge pull request #149 from HeroesGrave/master

Fixed for latest Rust