Merge pull request #1 from NetEase/master