Ported to Rust 0.6
Merge pull request #1 from kvark/master

Port to Rust-0.6