Fix Issue#29
Merge pull request #46 from yamanetoshi/Issue#29

Fix Issue#29