Merge pull request #24 from TheBlueMatt/main