added documentation
Merge branch 'hotfix/document-methods'
resolved conficts