Rust upgrade
Merge pull request #19 from larsbergstrom/rust_20140224

Rust upgrade