merge from luca76

for context menu