Merge pull request #6 from GitNooby/master

got the merge
Merge pull request #6 from zhonglinyuan/master

Merge pull request #6 from GitNooby/master