Refactor to use package rather than supervisor and misc other changes
Merge pull request #1 from Intelliplan/master

Refactor to use package rather than supervisor and misc other changes