improved config
Merge origin/master