Version v1.16.0 - Added Wrap function