#169 enabled merging of user settings
Merge pull request #452 from krzyk/169

#452: pull request #169 enabled merging of user settings