Fix for #285
Merge pull request #289 from PonteIneptique/tooltip

Fix for #285
Merge branch 'master' into merge_guides