fixed header attempt
Merge branch 'sam'