Fixed simpleChoices to make it much easier and user-friendly.
Merge branch 'dev' into patch-1