Enh: Issue #688 / add configuration option