Merge pull request #87 from julianladisch/Header-always-add