Update examples
Merge branch 'dev'