Layout "simple" à la place de "main"
Merge branch 'master' into gh-pages