Merge pull request #420 from hornc/master

Fix 'host' regex and format: uri conflict