Some changes on documentation
Merge branch 'develop'