Merge pull request #47 from hiroto-exp/master

#45