Merge pull request #1 from shihongzhi/master

roll back
Merge pull request #2 from shihongzhi/new

Merge pull request #1 from shihongzhi/master