Issue 285

Fixing Issue_285 https://github.com/TeamMentor/Master/issues/285