Enhance unwrap on wrapper
Merge pull request #325 from nicolas-f/unwrap

Enhance unwrap on wrapper