Fix Issue#39
Merge pull request #41 from yamanetoshi/Issue#39

Fix Issue#39