Issue 384

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