Fixing Issue_504 https://github.com/TeamMentor/Master/issues/504
Merge pull request #78 from michaelhidalgo/Issue_504

Fixing issue  504 https://github.com/TeamMentor/Master/issues/504