fixed routes
Merge branch 'kiope'