Update examples and plugin.xml
Merge branch 'dev' into test
Update example code