Fixing docs
Merge branch 'develop'