the renaming is an obsession
option voting and option
Merge remote-tracking branch 'pascal/master'