Merge branch 'develop'
Merge pull request #1 from tngaultney/master

Merge branch 'develop'