Merge pull request #24 from rasmusprentow/master

Merge pull request #23 from rasmusprentow/scorekeeper
Merge pull request #26 from rasmusprentow/scorekeeper

Merge pull request #24 from rasmusprentow/master