Merge pull request #55 from hiroto-exp/master

#71