tooltip working perfectly
Merge branch 'master' into authenticate