Fix duplicated supervisor bug.
Merge branch 'master' into develop
Added a test to show where the bug is.
Critical bug fix for pre and post conditions.
Version bump.
Merge branch 'develop'