Update to Rust master pt2
Merge pull request #30 from cmr/update-master

Update to Rust master