Merge change 174 into donut

* changes:
  Improve glgen