gbonnema/xmas — pull request #2 by gbonnema (2014-12-24 16:31:31+00:00)
Title: Feature/control

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