Merge pull request #747 from brooksryba/develop

Develop