Fix to build against latest rust nightly.
Minor update for latest Rust.
Merge pull request #1 from luqmana/master

Sync against upstream.