Fix Issue#8
Merge pull request #21 from yamanetoshi/Issue#8

Fix Issue#8