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

Update for rustc