Core - Config (fix)
Merge pull request #35 from Kristories/develop

Core - Config (fix)