Merge pull request #35 from TheBlueMatt/main