Added better markdown format support