Merge pull request #5 from shmilyliang/test-branch

你是水，你是死鬼，你是谁，你是鬼！！！！
Merge pull request #6 from shmilyliang/master

Merge pull request #5 from shmilyliang/test-branch