Ecological Inference with individual and aggregate data