Merge pull request #7 from TheBlueMatt/2021-03-tweaks