Added missing things to docs
Merge branch 'develop'