Make the markdown parser a bit more robust?