context menu
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from ltruong1/master

context menu