Fix #29
Merge pull request #34 from taguchimail/bendyer-29

Fix #29