Merge pull request #894 from TheBlueMatt/2021-04-fix-docs