updated to correct version, added plugin support