refactored voting
Merge remote-tracking branch 'decko/master'