Adding having functionality and tests
Merge pull request #25 from filaruina/master

Adding having functionality and tests