Change
Merge pull request #680 from brooksryba/develop

Change