Updating to support SSL better... #2