Merge pull request #17 from ZhiGuang/master

Fixed issue #15
Merge pull request #26 from Kooboo/4.1.0

Merge pull request #17 from ZhiGuang/master