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

Fix Issue#35