Update for language changes (Rust RFC 49)
Merge pull request #3 from Florob/fixup

Update for language changes (Rust RFC 49)