No reason to restrict to pandoc.

Also fixing minor bug.