Merge branch 'develop'
Documentation update
Merge branch 'master' into develop