Merge pull request #1 from CNRobinKill/master

Update
update
Merge pull request #5 from Ni9e/master

Update