comediansincarsgettingcoffee.com support (#2136)

This should resolve #2136 at least partially.

**Note**: I have left a few comments in the source code with some minor metadata issues. I am also not sure if I got the test correctly.