Rework the way Number is handle in the Units
Merge pull request #17 from qidane/new-units

Rework the way Number is handle in the Units