Merge pull request #133 from saszawa/option-menu

リトライ修正
Merge pull request #134 from saszawa/develop

Merge pull request #133 from saszawa/option-menu