Updating fork; going to fix context menu sample