number formatting for input and output
Merge branch 'develop'