[ issue 1103 ] Improved documentation