Using config module directly
Cleanups
Do not open all files at once (ported from master)
Merge pull request #1 from Kronuz/development

Development branch created