(merge) PVR

merged with xhaggi's branch PVR changes