Create settings
Merge branch 'efe'
updatee