Merge pull request #100 from Tomaka17/master

Update to latest cargo
Update for language changes
Merge pull request #102 from bjz/update

Update for language changes
Update to Rust nightly