Fixes #54
Fixes #52
Merge pull request #55 from yuijim/issue-52

Fixes #52