Added information about the code in the header
Merge branch 'master' into feature2