Add support for the UNION clause

Adds support for UNION.

Also has the changes from my last pull request so closes #34 too