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

Fix Issue#25