Fix Issue#23
Merge pull request #24 from yamanetoshi/Issue#23

Fix Issue#23