Added ability to define custom clauses, updated tests
updated readme