adding documentation to the sources
merge conflicts solve