Added multiple choice points
Merge branch 'develop'