Merge pull request #26 from TheBlueMatt/main