Fix examples.
Merge branch 'develop'