2 Commits (featureMatrixCalculator)