Rust upgrade
Merge pull request #13 from larsbergstrom/rust_20140224

Rust upgrade