Merge pull request #1 from Ni9e/master

close con
修改22

修改22
修改23

修改23
Merge pull request #2 from CNRobinKill/master

update