Merge pull request #17 from jkczyz/2021-06-guide-updates