Prefer pandoc
Merge branch 'dev'