Modified plugin based on working through Origin failures
Merge pull request #8 from nhr/test_refactor

Modified plugin based on working through Origin failures