Fixes #48
Merge pull request #49 from yuijim/issue-48

Fixes #48
Fixes #41
Fixes #47