Merge pull request #1 from hivefans/master

merge request
Merge pull request #2 from xianglei/master

Merge pull request #1 from hivefans/master