IST-109, updated format with combined units/dollars
Merge branch 'master' into beta