change settings declaration
Merge branch 'devel'