fix default settings merge
Merge pull request #5 from livibetter/fix-defaults-merge

fix default settings merge