Changed recorded and reported units to 1.0 to make integers appear more nicely in output values
Merge remote-tracking branch 'origin/master'