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

Update for rustc