Merge pull request #39 from TheBlueMatt/main