完成2

完成2
Merge pull request #6 from CNRobinKill/master

Update