Update for Rust 0.7
Merge pull request #9 from mibitzi/master

Update for Rust 0.7