Fix ids of headers
Merge remote-tracking branch 'origin/master' into adi-classes