Added support for underlines in URLs.
Merge branch 'switch-to-sparql'