Merge pull request #51 from rasmusprentow/master

Down from Master
Fixed config such that it split strings properly
Merge pull request #52 from rasmusprentow/scorekeeper

Scorekeeper