Updated examples.
Updated to version 3.6.
Merge branch 'develop'