UPDATE: fonts added
Merge origin/master