URI add
Merge branch 'master' of github.com:nigelsmall/urimagic