updates for new evaluator facility
Merge pull request #7 from istudens/evaluator

updates for new evaluator facility