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

Update for Cargo