Change output format of query-gene
Merge branch 'generator' into gb_master