Fixed error forming an extension of a filename
Merge branch 'enh/EvaluationAlgorithms' into experimental