Merge pull request #1 from JeffreySu/master

合并原作者更新