Fixed a few problems associated with rounding errors
Merge remote-tracking branch 'origin/master'