Update for rustc
Merge pull request #222 from tomaka/update-rustc

Update for rustc