Style
Merge pull request #649 from brooksryba/develop

Style