merge latest  master into dalehenrich