Merge pull request #13 from myrle-krantz/develop

Improved configuration validation