Update to master
Merge pull request #60 from cmr/master

Update to master