Added font properties
Merge branch 'develop'