Add advanced configuration
Revise doc layout
Merge branch 'master' into gh-pages