Rust upgrade
Merge pull request #35 from larsbergstrom/larsberg/rust_20140224

Rust upgrade