Updated with changes from master
Modify the URL rewriter to accept more than one parameter