+ RatingSupervisor added (tested)
Merge ChallengeAccepted/master