Merge pull request #4 from mdavy86/feature/configs

Feature/configs