5: Improve demos 
Updated to new API/Library
Task-Url:
https://github.com/unitsofmeasurement/unit-demos/issues/issue/5