add choice options
Merge pull request #24 from sasarky/feature/choice

add choice options
Merge develop into master