Fixes #68
Merge pull request #72 from hisohito/master

Fixes #68