Issue #41
Merge pull request #45 from hiroto-exp/master

#41