Merge pull request #677 from algal/feature/marginal-headers-tty