Merge pull request #45 from TheBlueMatt/main