fix issue #26
Merge pull request #27 from wizzup/dev/wizzup/issue/26

Propose to fix issue #26