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

Fix Issue#36