Update to master
Merge pull request #58 from cmr/update

Update to master