Fixing Issue_656
Merge pull request #83 from michaelhidalgo/Issue_565

Fixing Issue 565 https://github.com/TeamMentor/Master/issues/565