Merge pull request #1 from cloudwu/master

rebase