Start new plugin architecture
Merge pull request #179 from guestisp/master

Pull request to sync the code