Added settings to the model
Merge branch 'master' into develop