Merge pull request #2 from JinoLi/master

as
Merge pull request #5 from zhai-php/master

Merge pull request #2 from JinoLi/master
Merge pull request #3 from JinoLi/master

5