documentation added
Merge origin/master