Merge pull request #830 from brooksryba/develop

Develop