Voting changes
Merge pull request #15 from samuelli/master

Voting changes