Changes settings
Merge pull request #1 from TheVileOne/more_testing

New changes