All settings variables correctly named
Merge pull request #30 from thgh/master

All settings variables correctly named