Added ability to customize unitOfMeasurement color. Fixes #8. Fixes #9
Merge remote-tracking branch 'origin/master' into enhancement-7