Merge pull request #42 from TheBlueMatt/main