improve pattern matching in router
Merge branch 'master' of github.com:wkjagt/WebGlue