updated documentation
merged