Merge pull request #19 from TheBlueMatt/main