Merge pull request #123 from jerv13/master

Fix plugin ordering.