Merge pull request #143 from klausw-g/plugin-tweaks