Fixes #460 - Format numbers better - Proper Commit
Fixes #460 - Checking for null and undefined | Added Unit Test
Merge pull request #514 from headwebmonkey/fix460-2

Fixes #460 - Format numbers better