Merge pull request #17 from cmr/master

Update for Cargo
Update for int inference