fixed bug in examples
Merge branch 'master' into files