Re-sync with MIND-Tools to integrate MIND-Tools PR#14 (reviewed fix-evaluator)

Re-sync with MIND-Tools to integrate MIND-Tools PR#14 (reviewed fix-evaluator)