Update for latest Rust
Merge pull request #148 from Arcterus/master

Update for latest Rust