Added context menu
Merge branch 'develop'