3を修正
Merge pull request #1 from dateofrock/branch1

3を修正