Added the format class based on the one from Haste extension
Return dash if value is empty
Merge branch 'release/1.6.0'