Merge pull request #1 from JeffreySu/master

与版本保持一直