Merge pull request #24 from rasmusprentow/master

Merge pull request #23 from rasmusprentow/scorekeeper