Martin Staehr authored 6 years ago and Julian Dehne committed 6 years ago

Merge remote-tracking branch 'origin/integrating_martins_module_#8' into integrating_martins_module_#8