Merge pull request #60 from TheBlueMatt/main