use si units and don't round values
Merge branch 'development' into units