Merge branch 'jannik-code' into dont-touch

for latest plugin code
update Stub for updated (merged) code