完成3

完成3
Merge pull request #7 from CNRobinKill/master

Update