Merge pull request #49 from TheBlueMatt/main