Added evaluator finally usable. more bug fixes.
Merge remote-tracking branch 'origin/master'