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

Fix Issue#33