Added configuration header
Merge remote-tracking branch 'origin'