Fixing header stuff
Merge branch 'hotfix/1.02.02'