Merge branch 'develop' into release/1.5.1
Merge branch 'master' into develop
Working on the documentation