Merge pull request #206 from WellingGuzman/welling

Prevent out of position tooltip