1) Support for merging configuration. 2) Avoid SAX Parser exception.

Pull request:
- in case you want to review the changes
- to get into the habit.