Fixes #45
Merge pull request #58 from yuijim/issue-45

Fixes #45