Updated with upstream version of plugin.