Add more flexibility for Cypher queries creation

see issue #48