Merge pull request #635 from brooksryba/develop

Develop