Pandoc improvements