added an if condition to test the settings
refactor
refactor 2
Merge branch 'hotfix/0.9.8'