Merge pull request #2 from nielsegberts/master

Fixed to work with newest version of Rust