Update make-examples
Merge branch 'yaml'