Adds __call to Supervisor
Minor cleaning
Merge branch 'feature/supervisor-clean' into develop