mentor fixes
Merge pull request #3 from jhumbrac/patch-3

mentor fixes