Merged changes, updated server URL