Added configuration files
Merge