Additional header information

This is for #29 and #31