First revision of rematch fix
Merge branch 'master' of github.com:pencilcheck/PvP