adding some documentation
merge