Change config handling
Merge origin/master