merge latest changes from pete