added the units stuff and fixed a few bugs.
Merge branch 'master' of github.com:mbeddr/mbeddr.core