Fix #28
Merge pull request #35 from taguchimail/bendyer-28

Fix #28