Style
Merge pull request #921 from brooksryba/develop

Style