Merge pull request #108 from TheBlueMatt/main