Merge pull request #602 from brooksryba/develop

Develop