setting change
Merge pull request #2 from thomaschuwm/develop

setting change