Merge pull request #171 from xen/master

Merge