Added support for numbered list as well as mixed lists.