Update for rustc

I'll merge if travis and appveyor pass.

Close #122