Markup changes; Quote regexp added