細かいバグ修正
Merge branch 'feature/00006' into develop
Merge branch 'release/1.0.5'