Merge pull request #95 from boersmamarcel/hotfix

Fixes supervisor bug #93 and adds test scenario #94
Merge branch 'master' into social