extra config options
Merge branch 'master' into wellcome