merge latest changs back into Paul master