Merge pull request #1 from taobao/master

合并原作更新