Fixed featureExpression calculation
TypeChef generates wrong FeatureExpressions, workaround function introduced
Merge remote-tracking branch 'origin/master'