fixed a get route
Merge branch 'develop'