Merge pull request #1 from xchliu/master

xiaocheng new
Merge pull request #4 from gxg353/master

Merge pull request #1 from xchliu/master