Added some markdown support