Hardening
Merge pull request #4 from killpackb/Setting-and-Config-Enhancments

Hardening