Updated to work with pandoc >= 1.12.1