Fix units if value is 0.0
Merge pull request #1922 from jburel/unit-issue-dev_4_4

Unit issue dev 4 4