Fix Issue #19
Fix Issue #18
Merge pull request #21 from yamanetoshi/Issue#18

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

Fix Issue #19