Minor bugfix tweaks
Update vote casting to support multiple value choices
Merge branch 'master' into develop