Merge pull request #77 from TheBlueMatt/2018-07-route-tweaks