Allow the usage of units like km and Mm
Merge pull request #1 from retoo/master

Allow the usage of units like km and Mm