Tighten number formatting implementation
Merge pull request #1 from organix/numfmt

Tighten number formatting implementation