Fixing Issue 51

https://github.com/TeamMentor/Master/issues/51