Fixes #103
Fixes #102 with a tooltip