Add more flexibility for Cypher queries creation
Add using, union and option match clauses
Add some unit tests
Fixing indent and conventions