Merge pull request #62 from OwenSmith/master

XenBus #46