Merge pull request #577 from brooksryba/develop

Develop