Merged settings files (fixes #126)