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

#25