Issues #15
Merge pull request #34 from hiroto-exp/master

#15
Merge pull request #33 from hiroto-exp2/master

#18