Add config file parsing
Merge