Merge pull request #60 from colincoghill/master

sync to master