Issues #09
Merge pull request #27 from hiroto-exp/master

#09