Clean code
Merge pull request #76 from dreamvids/Settings-V2

Clean code