Merge pull request from jiazhewang/patch-1 compatible with fontWeight in number