Merge pull request #239 from mxk/plugin-fix