Merge pull request #6 from TheBlueMatt/main