Refactoring PluginSupport
Merge branch 'master' of github.com:tianrolin/plugin