Made generic for supervised performance evaluator more inclusive.
Merge branch 'master'