Major update to the functionality of the plugin
Merge branch 'contentfeatures' into develop