Merge pull request #22 from pinumbernumber/master

Fix build with current Rust