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

Update for latest Rust