Merge branch 'issue-26' into 'develop-v2.1.1'

closes #26, deletes subclasses of unitofmeasure

Closes #26

See merge request !17
2 jobs for develop-v2.1.1
in 22 seconds, using 0 compute credits, and was queued for 26 seconds