Merge pull request #60 from colincoghill/master

sync to master
Merge pull request #61 from colincoghill/develop

Merge pull request #60 from colincoghill/master