fork of rev 150 of pandora_client