Much simpler and flexible etree searching
Merge branch 'tester'