Improved ChooseOption.
Merge branch 'master' of https://github.com/SRL/SRL-6