Improved documentation and allow wrapping with unordered list