Merge pull request #86 from julianladisch/Header-always-set