Add documentation
Merge branch 'feature/comment' into develop