update docs
merge
last minutes changes