Working on updating the plugin to 3.0, work in progress...