Merge pull request #2 from huguogang/master

merge