Merge pull request #883 from brooksryba/develop

Develop
Fucking rounding error cropping up again