Fix header count and weird repositionning
Merge pull request #12 from vishna/master

Unrottening potato