Adding settings config
Merge origin/master