Added regex to handle uri matching #224