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

Fix Issue#26