Improved tooltips
Merge pull request #1 from cygri/master

Improved tooltips