Minor amendments before submitting the documentation for review
Merge branch 'thomas'