Add simple configuration
Update doc
Merge branch 'simplify-configuration'