fix issue #21
Merge pull request #25 from idy/issue-21

fix issue #21