Fix Issue#24
Merge pull request #25 from yamanetoshi/Issue#24

Fix Issue#24