New and Improved Header

this is merged with James' latest update. For some reason I couldn't
successfully rebase so I re-forked.
Merge pull request #22 from FenrirAB/master

New and Improved Header