add by wuyix
Merge pull request #1 from hiboys/master

hello