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

Fix Issue#27