Update for Rustc
Merge pull request #237 from tomaka/master

Update for Rustc