Merge pull request #1 from shihongzhi/master

roll back