update docs
merge branch
fixed readme