Change font names
Minor issues
Merge branch 'issue-14' into develop