Fix Issue#42
Merge pull request #43 from yamanetoshi/Issue#42

Fix Issue#42