master update
mergeed, I think
fixed conflicts