Tooltip update
Merge branch 'master' of https://github.com/sw4/pocketknife
Merge branch 'master' of https://github.com/sw4/pocketknife