Issue #12 : add support for group by and having clause