Fixed issue #37
Merge pull request #39 from kooboo-jifeng/master

Fixed issue #37