Merge branch 'multi-plugin-beta'

Closes #6