Changes made to fix routing on the server
Merge branch 'issue-109' into develop