Fix for option header and footer
Merge pull request #2 from goldins/master

Fix for optional header and footer