Merge pull request #5 from GitNooby/master

Merge pull request #4 from zhonglinyuan/master
conflict
Merge pull request #5 from zhonglinyuan/master

testing conflicts