Merge pull request #4 from Aki07/develop

Develop
Merge pull request #6 from Aki07/develop

Develop
リファクタリング