Fixed issue #6 added popup menu