add settings
Merge branch 'develop' of https://github.com/nromanen/Ch-024 into develop