Fix Issue#11
Merge pull request #15 from yamanetoshi/Issue#11

Fix Issue#11