Merge pull request #101 from TheBlueMatt/main