Added documentation
merge conflict and added documentation