Final changes

Signed-off-by: Jesse Dobbelaere <jesse@dobbelaere-ae.be>
Merge branch 'master' of https://github.com/jessedobbelaere/MatchTracker