Improve the documentation
Merge branch 'feature/documentation' into develop

* feature/documentation:
  Improve the documentation