Adding units to results where required [enhancement]

[CixoDevelop]

Hey! I've noticed that in some cases, when the query result is a number that should have a unit, f.i. km^2, only the number is returned. This can be confusing for users who use services relying on this wrapper. It would be a good idea to consider supporting units for numeric answers as indicated on Wikipedia.