5: Improve demos 

Task-Url: https://github.com/unitsofmeasurement/uom-demos/issues/issue/5