fixed score computation w/ scale factors
Merge branch 'master' into npRmpi