Plugin rework
Merge pull request #2 from JHeidinga/master

Plugin rework