Merge: Markdown: some improvement and fixes