Merge pull request #1008 from brooksryba/develop

Develop