Improved documentation settings.
Merge branch 'documentation' into sphtp