First version of the example
Merge branch 'master' into tmp