Merge pull request #108 from saygoweb/pr/plugin