Merge pull request #1 from yangfannet/master

update font