Merge pull request #38 from TheBlueMatt/main