added support for short tags and ASP style tags