New features

Add wrap and wrapAll functions