add XpathBuilder
Merge branch 'xpath-builder'