Merge pull request #1 from shenweip/master

Merge pull request from shenweip/master