Simplify plugin by using existing plugins
Oups, fix test
Merge pull request #5 from kjbekkelund/use-existing-plugins

improved readability by using existing plugins