Merge pull request #7 from TheBlueMatt/2022-08-fix-deadlock