Merge branch 'refactor-plugins-2'
Merge branch 'master' of github.com:pynag/pynag