Merge pull request #13 from TheBlueMatt/2021-04-bump-upstream