Changes to add proxy user and proxy password
Changes to compile in Eclipse