Merge pull request #47 from TheBlueMatt/main