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

Fix Issue#40