Fix position of tooltips - fixes #44
Merge branch 'issue/#44'