Update for rustc
Merge pull request #218 from tomaka/master

Update for rustc