Merge pull request #4 from kvark/master

Updated to Rust master