PR for #436 

HOLD THIS PR UNTIL NEW FONTS PR IS MERGED