Merge pull request #1 from yoshie22/master

test1
Merge pull request #2 from yoshie22/master2

Merge pull request #1 from yoshie22/master