issue-356 Documentation