Fixing Issue https://github.com/TeamMentor/TM_4_0_Design/issues/122
Merge pull request #167 from michaelhidalgo/3.6_Dev

Fixing Issue https://github.com/TeamMentor/TM_4_0_Design/issues/122