Updated documentation
Merge branch 'feature-documentation' into develop