Resolves #55 Route matching