Merge pull request #76 from hiroto-exp/master

#162