Merge pull request #25 from TheBlueMatt/main