Merge pull request #8 from rasmusprentow/master

Into scorekeeper with latest