Merge pull request #43 from TheBlueMatt/main