Adding some 'logic' to work around config issues
Merge pull request #36 from holtscomm/config-fix

Adding some 'logic' to work around config issues