Merge pull request #1 from CNRobinKill/master

修改21
update
Merge pull request #6 from Ni9e/master

Update