Merge pull request #920 from brooksryba/develop

Develop
Style