Merge branch 'hotfix/simple-hotfix'
Merge pull request #1 from jefffarkas/develop

Develop