Merge configs

Fix for issue #820