Improve configuration merging
Update readme