Added M.wrap..
Fixed conflicts.