Font
Config fix
Fix
Merge branch 'master' into gh-pages