Merge pull request #1 from xchliu/master

xiaocheng new