Merge pull request #123 from HeroesGrave/master

Updated to latest Rust