Merge branch feature/poll-votes

This will close #3