Add font
Merge pull request #103 from mojsart/develop

Missing master code
Merge pull request #104 from mojsart/staging

Staging to master