fix issue #30
Merge pull request #1 from kz26/dev

fix issue #30