Issue #25
Merge pull request #39 from hiroto-exp2/master

#25
Merge pull request #40 from hiroto-exp/master

#24