Add support for plugin
Merge pull request #2554 from jonathantyates/patch-1

Add support for plugin