#216 Improved documentation