Merge pull request #872 from brooksryba/develop

Develop