Merge pull request #573 from brooksryba/develop

Develop