Merge pull request #541 from tobiasd/20180311-pageheader