Recognize more generic URLs

This fixes issue #21