Merge pull request #52 from TheBlueMatt/main