Add option for adding tooltips fixes #2