(merge) PVR

merge with xhaggi's helix PVR