Add Route Function
Merge branch 'develop'