Merge pull request #330 from retro-wertz/skip_plugins