Merge pull request #135 from glenwks/master

Mentor Button Fix
Merge remote-tracking branch 'genshyft/master'