updated docs
merged remote