Merge pull request #7 from TheBlueMatt/main