Fix for latest Rust
Merge pull request #85 from nstoddard/master

Fix for latest Rust