Fix Issue #19
Merge pull request #20 from yamanetoshi/Issue#19

Fix Issue #19