Feature/en 1831

I don't think this should be hardcoded in the DLL, use the ServerUrl property instead.