Merge settings fixes #33