Merge pull request #59 from TheBlueMatt/main