URLResolver beta 2.0.9.01
Lots of updates