Merge pull request #68 from hiroto-exp2/master

#124