basic layout and configuration
Merge branch 'master' into HEAD