FIX: typo
router now accepts simple regex

FIX: router accepts regex
FIX: coding style
FIX: comments
FIX: merge conflict