xxx
Merge pull request #646 from wenshao/master

xxx