Tooltip v1.0

Merge of Tooltip-branch.