Updated to work with most recent version of jchristman:context-menu