Added better markdown support by @gabrielelana