Marshall pens new Warriors deal