Issue 320: context menu added