Framework updates
Demoplugin
Bugfixes