added settings
Merge branch 'master' into develop