Added parsing of templates wiht alternate delims