fix #24
fix #24
fix #24
fix #24
Merge pull request #28 from intaro/issue-24

fix #24