#389 Improved documentation