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

Ported to Rust-0.8