Added popup-menu based on Thomas Chust's feedback