Added fix for router that allows for routes to be set in any order. Added support for base route URL.