Merge pull request #97 from TheBlueMatt/main