updates on framework

Rieks Joostenrequested to merge
terminology-rieks into master

Merge request reports