Issue #111
Merge pull request #65 from hiroto-exp/master

#111