Fixes required for merge
Merge pull request #174 from dionyziz/remove_winner_exception

Make changes required to merge with master.