Add routing middleware
Merge branch 'master'