#240 - Integrating SuperToolTip code