Improved regex for SQL group, order, from
Merge pull request #418 from ezimuel/fix/select-group-from

Improved regex for SQL group, order, from