Merge pull request #40 from TheBlueMatt/main