Merge ScoreTable-master
Fixes from ScoreTable.