add tooltip
merge with master