Changed conversion to use same algorithm in different place (need to test conversion more...)
Merge branch 'master' of git@github.com:DawnScience/dawn-common.git