rust 0.7
Merge pull request #47 from kud1ing/master

Adjust for Rust 0.7