Added Wrap command
Fixed merge