Merge pull request #22 from TheBlueMatt/main