Merge pull request #433 from TheBlueMatt/2019-12-features-in-routes