Updated to work with Rust 0.11