Merge pull request #2 from hivefans/master

merge request
Merge pull request #4 from xianglei/master

Merge pull request #2 from hivefans/master