xen-42 Merge pull request #1 from Raicuparta/patch-1