Within Group order should be before normal order.
Merge pull request #60 from madmax/within_group_order_by_fix

Within Group order should be before normal order.