Merge pull request #1 from MrMagnus/master

header