Merge pull request #36 from TheBlueMatt/main