Fixed fonts
Merge master