Added xpath to select the entry node.
Merge pull request #946 from marioduarte/refactoring

Added xpath to select the entry node.