returning proc from expand_query, corrected
Merge pull request #46 from rwhaling/master

returning proc from expand_query, corrected