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

Fix Issue#18