Fixing Issue 193
Merge pull request #74 from TeamMentor/Issue_193

Fixing Issue 193