Fix bug with loading config files, finally
Merge branch 'fix'