Update for Cargo
Merge pull request #178 from cmr/master

Update for Cargo