Update for Cargo
Update glw
Merge pull request #86 from cmr/master

Update for Cargo