Done an improvment of font selection - #34