fix the centroid fitter
Merge remote-tracking branch 'origin/master' into corefix2