adjust evaluate, bug fixes

Florian Oppermannrequested to merge
61-refactor-modelhandler into develop

Signed-off-by: Florian Oppermann florian.oppermann@eonerc.rwth-aachen.de

Closes #61

Merge request reports