Merge pull request #102 from TheBlueMatt/main