refactor
Settings added
refactor
refactor
refactor
Merge remote-tracking branch 'origin/master'