Header/Footer modifications
Revisions asked by Johann
New revisions.
Merge pull request #30 from phuppe/headfoot

Header/Footer modifications