#348
Merge pull request #349 from amdrade/develop

#348 Error saving settings