Feature/control

Stephan, Jeroen: please review and leave comments. Do not integrate. If approved I will do a git flow feature finish thingy.