Fixes #60 - switch to use native XPath Query API