Merge pull request #1 from zhzhfriend/master

Merge pull request #1 from wanglifeng/master