Merge pull request #1556 from danielgranhao/2022-06-improve-docs