Merge branch 'develop'
creating core plugin class, better testing (wip)