Rewrote URLQuery to avoid the PEG
Merge branches 'urlquery-rewrite' and 'master'