Fixed tooltip issue
Merge branch 'issue-108' into develop