Squashed commits: config option, updated docs, bugfix