Fixes for config
Merge pull request #3 from PopShack/fixesForConfig

Fixes for config