バグ
Merge pull request #291 from qtamaki/develop

バグ
Merge pull request #292 from goldrush/develop

Develop