fixed the score calculation
Merge branch 'master' into npRmpi