Working on REST forwarding in server.go
Merge fix