More changes in the config file
After merging
Corrected an error in the config template
Merge branch 'master' into feature_AdjTNE2