improve code structure in localscoremanager
Merge branch 'master' into gh-pages