Fixing typo
Add routes to server
Merging in master