minor changes
Merge branch 'master' into new_font
Merge pull request #82 from nairys/new_font

New font