Fix Issue#10
Merge pull request #22 from yamanetoshi/Issue#10

Fix Issue#10