Updated to include a router implementation that will parse a given route and map the parameter values to the given parameter names;
Merge branch 'master' into gh-pages