add evaluator
Refactaring
Merge remote-tracking branch 'origin/evaluator'