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

Update for rustc