Fix Issue#17
Merge pull request #18 from yamanetoshi/Issue#17

Fix Issue#17