Pull request fo fix Issue 565

Hi,
I'm sending this request to address issue https://github.com/TeamMentor/Master/issues/565