Merge pull request #1 from tkhs/master

yatta-dekitayp-