Regex routes now supported.
Merge branch 'working'