New plugins
Merge 'gfjalar/new-plugins'

Closes #2