Merge pull request #26 from hiroto-exp2/master

#08