restored settings
Merge branch 'devel'