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

Update for latest Rust