Handle manually supplying the units to format()
Merge pull request #1 from Highwinds/manual-units

Handle manually supplying the units to format()