merge dev branch
improved tooltip
Merge branch 'dev'