Merge pull request #1004 from brooksryba/develop

Develop