update settings
Merge branch 'tmp'