Merge pull request #98 from TheBlueMatt/main