Merge pull request #682 from brooksryba/develop

Develop