Fixed routing for server
Merge branch 'issue-110' into develop