route refactor
Merge branch 'master' into ar