Add tag name to tree output
Add guards to parse block returns
Add support for multiline pattern matching
Add file to template variables