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

Update for rustc