Merge pull request #8 from rasmusprentow/master

Into scorekeeper with latest
Merge pull request #12 from rasmusprentow/scorekeeper

Merge pull request #8 from rasmusprentow/master