Adding support for markup in header assignment, hopefully resolves #535