add choice
Merge pull request #23 from 7kaji/feature/choice

add choice
Merge develop into master