docs updated
merged