settings fix
Merge pull request #838 from andrzej-jankowski/develop

settings fix