Added Master Control. Fix #47