Fixes #101
Merge pull request #110 from yuijim/issue-101

Fixes #101