[ issue 1103 ] Improved documentation
Merge branch 'maint-2.4.2'