Merge pull request #17 from TheBlueMatt/2021-04-upstream-confirm