Added better markdown support