fixed Supervisor class
Merge branch 'feature_20140601' into develop