Fix race in Header
Remove spurious lines
Merge pull request #50 from nictuku/race

Fix race in Header