Merge pull request #12 from lwhiteley/master

merge latest into develop
Merge pull request #13 from medullan/develop

Merge pull request #12 from lwhiteley/master