Merge pull request #1 from Shuailong/master

DaiYiwen