Add expand-query macro.
Switched to print from pprint
Merge pull request #237 from Gerrrr/feature/expand_query

Add expand-query macro