added code to parse short tags