Fixes #105
Merge pull request #107 from yuijim/issue-105

Fixes #105