Merge pull request #96 from TheBlueMatt/main