Added new constructors to Choice
Merge branch 'choice' into develop