Takayuki hoshi1984 master

merge