Added metric formatting
Merge branch 'develop'

* develop:
  Added metric formatting