returning proc from expand_query
Merge pull request #238 from rwhaling/master

returning proc from expand_query