Update documentation
Merge branch 'develop' into feature/iterate