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

Update for rustc