Fix bugs in examples
Merge branch 'develop'