Merge pull request from jiangxin/master