0.1.8 -- make URI matching less strict