Merge pull request #1 from takayuki-hoshi/master

Fork merge
Revert "Fork merge"
Merge pull request #3 from TakayukiHoshi1984/revert-1-master

Revert 1 master