Some changes to enable markdown syntax