Update config sample
Merge branch 'scaffolding'