Fix Issue#27
Merge pull request #36 from yamanetoshi/Issue#27

Fix Issue#27