Improvements in setting handling
Merge branch 'development'