Merge pull request #1 from cjm0000000/master

合并原作者的更新