Fixing Issue_445 https://github.com/TeamMentor/Master/issues/455
Merge pull request #76 from michaelhidalgo/Issue_445

Fixing Issue 455 -https://github.com/TeamMentor/Master/issues/455