Merge branch 'develop' into plugin_dev
massively improved plugin logic
Merge pull request #35 from yiendos/plugin_dev

Plugin dev