Merge pull request #1 from hiboys/master

hello
hello
Merge pull request #1 from heiyixueren/master

111