added files from paulo.quintans