lock をひとつに
Merge develop into master