Merge pull request #648 from brooksryba/develop

Develop