Merge pull request #84 from danw/pkgctx

Allow wrapping of PackageContext