Merge pull request #19 from rasmusprentow/master

Pulling down from master
Merge pull request #20 from rasmusprentow/scorekeeper

Merge pull request #19 from rasmusprentow/master