Merge pull request #87 from TheBlueMatt/main