merge in to master

all changes so far ...