Updated for latest Rust
Merge pull request #157 from ozkriff/master

Updated for latest Rust