moving changes from pandoc_toc branch to master