Fix Issue#8
Merge pull request #32 from yamanetoshi/Issue#8

Fix Issue#8