xen-42 Merge pull request #5 from xen-42/dev