Fix Issue#31
Merge pull request #34 from yamanetoshi/Issue#31

Fix Issue#31