Merge pull request #54 from hiroto-exp/master

71/75