Adding support for markup in header assignment, resolves #535