adding documentation
merge