settings update
Merge origin/master