Fix routes
Fix auto suffix slash
Merge branch 'master' into develop