fixed config file parsing
Merge branch 'working'