Merge pull request #12 from lwhiteley/master

merge latest into develop