Merge pull request #783 from brooksryba/develop

Develop
Winning::