Merged with signalr webserver