Added supervisor support
Merge branch 'master' of github.com:Chandler/flesh