Fixing Issue_461 https://github.com/TeamMentor/Master/issues/461
Merge pull request #79 from michaelhidalgo/Issue_461

Fixing Issue 461