Basic attempt to get it working right for now.
Whoops
Version 0.5.0
Merge branch 'devel'

Conflicts:
	package.js
Rename with -> plugin